[MIRROR] Interaction System Update #1989
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Fix open_interaction_menu proc to properly label itself as a DCS signal handler, added INVOKE_ASYNC usage to ui_interact call. * Refactor interaction datum. Bugfix nonfunctional interaction sounds. Add sound_vary parameter to interactions. Add pronoun usage to interactions. Allow interactions to cause pain even if not lewd. Add INVOKE_ASYNC usage to interaction effects.
|
This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself. |
AnywayFarus
added a commit
that referenced
this pull request
Mar 1, 2024
Iajret
pushed a commit
that referenced
this pull request
Apr 14, 2024
* Fixes a critical spelling mistake (#82651) ## About The Pull Request See title ## Why It's Good For The Game Spell word good is good. ## Changelog :cl: spellcheck: Pre-Approved Cyborg Candidates are no longer "Cantidates" /:cl: * Fixes a critical spelling mistake --------- Co-authored-by: Thunder12345 <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Original PR: NovaSector/NovaSector#863
About The Pull Request
This PR includes a modest refactor, bugfix, and feature update to the interaction system.
If you are merging this PR on a downstream repository, please feel free to download the updated JSON files:
Download updated-interactions.zip from Google Drive
Granular list of changes:
Fixed a bug which was causing self-interactions to be usable on people other than yourself.
Fixed a severe bug which was causing the interaction menu to call
sleepand block processing of DCS signals:open_interaction_menuDCS signal handler. I fixed the issue by usingINVOKE_ASYNCon the offending function calls.(Sleeping/Blocking calls made from within DCS signal handlers are not allowed. Critical warnings are thrown in logs.)
SIGNAL_HANDFLERheader. Such a header is literally only composed ofSHOULD_NOT_SLEEP(TRUE)which immediately throws warnings due to the blocking calls to TGUI which take place in the interaction menu.actproc blocks via calling TGUI as well, so I moved the offending code to an asynchronousapply_effectsproc.Fixed the
sound_possibleandsound_useparameters, which were non-functional due to developer error:SEND_SOUNDwas being called in a for-loop with erroneous input operands.SEND_SOUND, interactions were not using thesound_rangeparameter when they were expected to.playsound.sound_vary, an input operand toplaysoundto randomly change pitch.Added a new pronoun template system to interactions using
replacetext:message,target_messages, anduser_messages.%TARGET_PRONOUN_THEIR%%TARGET_PRONOUN_THEM%%TARGET_PRONOUN_THEY%%USER_PRONOUN_THEIR%%USER_PRONOUN_THEM%%USER_PRONOUN_THEY%How This Contributes To The Nova Sector Roleplay Experience
This PR helps to make interactions a bit more personable by including the expected gender pronouns in interactions messages. Additionally, I identified and repaired minor and severe bugs. I fixed a minor bug which was preventing interaction sounds from working as expected, and a severe bug which was causing the DCS to sleep/block execution when it isn't expected.
While not included in this PR, I have also updated all of the interaction JSON files with pronoun tags and sound effects; the updated JSON files will be transmitted to the head maintainer for later addition.
Proof of Testing
I've been testing the updated code in an invite-only server for some time. I have also tested on the most recent Nova Sector build.
Screenshots/Videos
Changelog
🆑 A.C.M.O.
fix: Fixed a bug which was causing signal handling to briefly freeze upon opening and using the interaction menu.
fix: Fixed a bug which was preventing playing sounds from interactions.
fix: Fixed a bug which was causing self-interactions to be usable on people other than yourself.
refactor: Added a template system to interactions to enable expected gender pronoun usage.
/:cl: